Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 22:01:52 +0000 (15:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 22:01:52 +0000 (15:01 -0700)
commite7d4b0f3cab97b6b4f58aab1e71d47b55563675a
treeb9398948344fde1594901a0159714fc020871082
parent6180fe345cd7edbbab214e7a353c5546c4a5e95d
parentb056f9398143fb4d7d2c229e79d6a6dcfdb58503
Merge from trunk.